I overlooked an if when I was adding the signal block/unblock code. Oops.

Mon Oct 13 20:21:38 2003  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtkentry.c (gtk_entry_set_text): I overlooked an if when
	I was adding the signal block/unblock code. Oops. (Noticed by
	Marco Pesenti Gritti).

diff --git a/ChangeLog b/ChangeLog
index b116a1a3bef9afe1b2a50a78d7a9eadb6f40b559..900053411072646fc01cd5e30fed240c2a7e34a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 13 20:21:38 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkentry.c (gtk_entry_set_text): I overlooked an if when
+       I was adding the signal block/unblock code. Oops. (Noticed by
+       Marco Pesenti Gritti).
+
 Mon Oct 13 20:21:55 2003  Kristian Rietveld  <kris@gtk.org>
 
        * demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b116a1a3bef9afe1b2a50a78d7a9eadb6f40b559..900053411072646fc01cd5e30fed240c2a7e34a2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Oct 13 20:21:38 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkentry.c (gtk_entry_set_text): I overlooked an if when
+       I was adding the signal block/unblock code. Oops. (Noticed by
+       Marco Pesenti Gritti).
+
 Mon Oct 13 20:21:55 2003  Kristian Rietveld  <kris@gtk.org>
 
        * demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b116a1a3bef9afe1b2a50a78d7a9eadb6f40b559..900053411072646fc01cd5e30fed240c2a7e34a2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Oct 13 20:21:38 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkentry.c (gtk_entry_set_text): I overlooked an if when
+       I was adding the signal block/unblock code. Oops. (Noticed by
+       Marco Pesenti Gritti).
+
 Mon Oct 13 20:21:55 2003  Kristian Rietveld  <kris@gtk.org>
 
        * demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b116a1a3bef9afe1b2a50a78d7a9eadb6f40b559..900053411072646fc01cd5e30fed240c2a7e34a2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Oct 13 20:21:38 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkentry.c (gtk_entry_set_text): I overlooked an if when
+       I was adding the signal block/unblock code. Oops. (Noticed by
+       Marco Pesenti Gritti).
+
 Mon Oct 13 20:21:55 2003  Kristian Rietveld  <kris@gtk.org>
 
        * demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b116a1a3bef9afe1b2a50a78d7a9eadb6f40b559..900053411072646fc01cd5e30fed240c2a7e34a2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Oct 13 20:21:38 2003  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtkentry.c (gtk_entry_set_text): I overlooked an if when
+       I was adding the signal block/unblock code. Oops. (Noticed by
+       Marco Pesenti Gritti).
+
 Mon Oct 13 20:21:55 2003  Kristian Rietveld  <kris@gtk.org>
 
        * demos/testpixbuf-scale.c: enable GTK_DISABLE_DEPRECATED again,

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 215748e000198403fec761ec18be80a6c42f1197..7385b991d2347106150f385b0aa3655b5085fab1 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3452,16 +3452,16 @@ gtk_entry_set_text (GtkEntry    *entry,
   g_return_if_fail (GTK_IS_ENTRY (entry));
   g_return_if_fail (text != NULL);
 
-  completion = gtk_entry_get_completion (entry);
-  if (completion)
-    g_signal_handler_block (entry, completion->priv->changed_id);
-
   /* Actually setting the text will affect the cursor and selection;
    * if the contents don't actually change, this will look odd to the user.
    */
   if (strcmp (entry->text, text) == 0)
     return;
 
+  completion = gtk_entry_get_completion (entry);
+  if (completion)
+    g_signal_handler_block (entry, completion->priv->changed_id);
+
   gtk_editable_delete_text (GTK_EDITABLE (entry), 0, -1);
 
   tmp_pos = 0;